From 592ad36213c4a94f2d17508654dfd489e5341520 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 10 Feb 2021 09:39:59 +0000 Subject: [PATCH] d/rules: Extend test timeout on slower architectures As of 4.0.1, mipsel was the only release architecture that timed out on the experimental buildds, but others are likely to be at risk. --- debian/rules | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/rules b/debian/rules index 7c4569e8b4..7838d90007 100755 --- a/debian/rules +++ b/debian/rules @@ -182,6 +182,18 @@ ifneq ($(filter %-udeb,$(built_binaries)),) dh_auto_build --builddirectory=debian/build/udeb endif +test_timeout_multiplier = 1 + +ifneq ($(filter arm hppa mips% sparc%,$(DEB_HOST_ARCH_CPU)),) +$(info Slow architecture detected, increasing test timeout) +test_timeout_multiplier = 10 +endif + +ifneq ($(filter m68k riscv64 sh4,$(DEB_HOST_ARCH_CPU)),) +$(info Architecture with qemu buildds detected, increasing test timeout a lot) +test_timeout_multiplier = 20 +endif + # TODO: Known failures: # amd64: none # arm64: none @@ -233,6 +245,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) --builddirectory=debian/build/deb \ -- \ --setup=x11 \ + --timeout-multiplier $(test_timeout_multiplier) \ || { \ e=$$?; \ tail -v -n +0 debian/build/deb/meson-logs/testlog-x11.txt; \ -- 2.30.2